Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix button name on updated form #18000

Merged
merged 1 commit into from
Aug 5, 2020
Merged

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Follow up on #17777 - rename buttong

Before

'Update Pending Status

After

Record payment'

Technical Details

Comments

Some slightly bigger changes we could make

  1. add total_amount as a field to the row
  2. add a payment for that amount, - either making it clear the email will only be sent if the payment completes the transaction, or sending a payment receipt in that case
  3. don't limit to Pending & permit both positive and negative

@civibot
Copy link

civibot bot commented Jul 30, 2020

(Standard links)

@civibot civibot bot added the master label Jul 30, 2020
@eileenmcnaughton
Copy link
Contributor Author

@agh1 you should probably give this a thumbs up since you are best placed to agree it

@agh1
Copy link
Contributor

agh1 commented Jul 31, 2020

The words look good to me. We do have a tendency to capitalize all of the major words on a button. It's not what I'd do normally, but it is more-or-less a standard. It's also presumably used for multiple contributions. It's a thumbs-up for me if you capitalize the P and make it "Payments".

@agh1
Copy link
Contributor

agh1 commented Jul 31, 2020

Separately, this and a few other PRs have this test failure on CRM_Contribute_BAO_ContributionRecurTest::testAutoRenewalWhenOneMemberIsDeceased and I know a certain someone who wrote a recently-merged PR affecting payment and contribution dates. @eileenmcnaughton do you think this might have been triggered by #17777, but if so, why wouldn't the test fail on that?

@agh1
Copy link
Contributor

agh1 commented Jul 31, 2020

Oh it looks like the test might have been fixed by #18003

@eileenmcnaughton
Copy link
Contributor Author

test this please

@agh1
Copy link
Contributor

agh1 commented Aug 3, 2020

@eileenmcnaughton sorry I just realized this still says "Payment" rather than "Payments". In the context, I think there will nearly always be more than one contribution receiving payments.

@eileenmcnaughton
Copy link
Contributor Author

@agh1 thanks - fixed

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 can you MOP

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 @colemanw let's merge this before the rc is cut

@seamuslee001
Copy link
Contributor

Strange class name now but I think the new button name makes it more clear what is going on here merging

@seamuslee001 seamuslee001 merged commit 8d4febf into civicrm:master Aug 5, 2020
@seamuslee001 seamuslee001 deleted the brn branch August 5, 2020 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants